From: Aaron Schulz Date: Fri, 15 Aug 2008 17:55:17 +0000 (+0000) Subject: Rewrite allpages to use a "tree" of index range subpages (similar to the starting... X-Git-Tag: 1.31.0-rc.0~45885 X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=c74f27700654e239efda5c90f0557c8aa8ed1998;p=lhc%2Fweb%2Fwiklou.git Rewrite allpages to use a "tree" of index range subpages (similar to the starting page) rather than one increasingly large range list (bug 13902) --- diff --git a/includes/specials/SpecialAllpages.php b/includes/specials/SpecialAllpages.php index 7223e31747..da35b7c9e5 100644 --- a/includes/specials/SpecialAllpages.php +++ b/includes/specials/SpecialAllpages.php @@ -13,7 +13,8 @@ function wfSpecialAllpages( $par=NULL, $specialPage ) { global $wgRequest, $wgOut, $wgContLang; # GET values - $from = $wgRequest->getVal( 'from' ); + $from = $wgRequest->getVal( 'from', '' ); + $to = $wgRequest->getVal( 'to', '' ); $namespace = $wgRequest->getInt( 'namespace' ); $namespaces = $wgContLang->getNamespaces(); @@ -24,14 +25,8 @@ function wfSpecialAllpages( $par=NULL, $specialPage ) { wfMsg( 'allinnamespace', str_replace( '_', ' ', $namespaces[$namespace] ) ) : wfMsg( 'allarticles' ) ); - - if ( isset($par) ) { - $indexPage->showChunk( $namespace, $par, $specialPage->including() ); - } elseif ( isset($from) ) { - $indexPage->showChunk( $namespace, $from, $specialPage->including() ); - } else { - $indexPage->showToplevel ( $namespace, $specialPage->including() ); - } + + $indexPage->showToplevel( $namespace, $from, $to, $specialPage->including() ); } /** @@ -40,9 +35,14 @@ function wfSpecialAllpages( $par=NULL, $specialPage ) { */ class SpecialAllpages { /** - * Maximum number of pages to show on single subpage. + * Maximum number of pages to show on single list subpage. + */ + protected $maxPerPage = 345; + + /** + * Maximum number of pages to show on single index subpage. */ - protected $maxPerPage = 960; + protected $maxLineCount = 200; /** * Name of this special page. Used to make title objects that reference back @@ -50,17 +50,13 @@ class SpecialAllpages { */ protected $name = 'Allpages'; - /** - * Determines, which message describes the input field 'nsfrom'. - */ - protected $nsfromMsg = 'allpagesfrom'; - /** * HTML for the top form * @param integer $namespace A namespace constant (default NS_MAIN). - * @param string $from Article name we are starting listing at. + * @param string $from dbKey we are starting listing at. + * @param string $to dbKey we are ending listing at. */ -function namespaceForm ( $namespace = NS_MAIN, $from = '' ) { +function namespaceForm( $namespace = NS_MAIN, $from = '', $to = '' ) { global $wgScript; $t = SpecialPage::getTitleFor( $this->name ); @@ -72,10 +68,18 @@ function namespaceForm ( $namespace = NS_MAIN, $from = '' ) { $out .= Xml::openElement( 'table', array( 'id' => 'nsselect', 'class' => 'allpages' ) ); $out .= " " . - Xml::label( wfMsg( $this->nsfromMsg ), 'nsfrom' ) . + Xml::label( wfMsg( 'allpagesfrom' ), 'nsfrom' ) . + " + " . + Xml::input( 'from', 30, str_replace('_',' ',$from), array( 'id' => 'nsfrom' ) ) . + " + + + " . + Xml::label( wfMsg( 'allpagesto' ), 'nsto' ) . " " . - Xml::input( 'from', 20, $from, array( 'id' => 'nsfrom' ) ) . + Xml::input( 'to', 30, str_replace('_',' ',$to), array( 'id' => 'nsto' ) ) . " @@ -97,7 +101,7 @@ function namespaceForm ( $namespace = NS_MAIN, $from = '' ) { /** * @param integer $namespace (default NS_MAIN) */ -function showToplevel ( $namespace = NS_MAIN, $including = false ) { +function showToplevel( $namespace = NS_MAIN, $from = '', $to = '', $including = false ) { global $wgOut, $wgContLang; $align = $wgContLang->isRtl() ? 'left' : 'right'; @@ -107,45 +111,54 @@ function showToplevel ( $namespace = NS_MAIN, $including = false ) { $dbr = wfGetDB( DB_SLAVE ); $out = ""; $where = array( 'page_namespace' => $namespace ); + + $from = Title::makeTitleSafe( $namespace, $from ); + $to = Title::makeTitleSafe( $namespace, $to ); + $from = $from ? $from->getDBKey() : null; + $to = $to ? $to->getDBKey() : null; + + if( isset($from) ) + $where[] = 'page_title >= '.$dbr->addQuotes( $from ); + if( isset($to) ) + $where[] = 'page_title <= '.$dbr->addQuotes( $to ); global $wgMemc; - $key = wfMemcKey( 'allpages', 'ns', $namespace ); + $key = wfMemcKey( 'allpages', 'ns', $namespace, $from, $to ); $lines = $wgMemc->get( $key ); + + $count = $dbr->estimateRowCount( 'page', '*', $where, __METHOD__ ); + $maxPerSubpage = intval($count/$this->maxLineCount); + $maxPerSubpage = max($maxPerSubpage,$this->maxPerPage); if( !is_array( $lines ) ) { $options = array( 'LIMIT' => 1 ); - if ( ! $dbr->implicitOrderby() ) { - $options['ORDER BY'] = 'page_title'; - } + $options['ORDER BY'] = 'page_title ASC'; $firstTitle = $dbr->selectField( 'page', 'page_title', $where, __METHOD__, $options ); $lastTitle = $firstTitle; - # This array is going to hold the page_titles in order. $lines = array( $firstTitle ); - # If we are going to show n rows, we need n+1 queries to find the relevant titles. $done = false; - for( $i = 0; !$done; ++$i ) { + while( !$done ) { // Fetch the last title of this chunk and the first of the next $chunk = is_null( $lastTitle ) ? '' : 'page_title >= ' . $dbr->addQuotes( $lastTitle ); - $res = $dbr->select( - 'page', /* FROM */ + $chunk = array($chunk); + $res = $dbr->select( 'page', /* FROM */ 'page_title', /* WHAT */ - $where + array($chunk), + array_merge($where,$chunk), __METHOD__, - array ('LIMIT' => 2, 'OFFSET' => $this->maxPerPage - 1, 'ORDER BY' => 'page_title') ); + array ('LIMIT' => 2, 'OFFSET' => $maxPerSubpage - 1, 'ORDER BY' => 'page_title ASC') + ); - if ( $s = $dbr->fetchObject( $res ) ) { + if( $s = $dbr->fetchObject( $res ) ) { array_push( $lines, $s->page_title ); } else { // Final chunk, but ended prematurely. Go back and find the end. $endTitle = $dbr->selectField( 'page', 'MAX(page_title)', - array( - 'page_namespace' => $namespace, - $chunk - ), __METHOD__ ); + array_merge($where,$chunk), + __METHOD__ ); array_push( $lines, $endTitle ); $done = true; } @@ -165,35 +178,35 @@ function showToplevel ( $namespace = NS_MAIN, $including = false ) { // If there are only two or less sections, don't even display them. // Instead, display the first section directly. if( count( $lines ) <= 2 ) { - $this->showChunk( $namespace, '', $including ); + $this->showChunk( $namespace, $from, $to, $including ); return; } # At this point, $lines should contain an even number of elements. $out .= ""; - while ( count ( $lines ) > 0 ) { - $inpoint = array_shift ( $lines ); - $outpoint = array_shift ( $lines ); - $out .= $this->showline ( $inpoint, $outpoint, $namespace, false ); + while( count ( $lines ) > 0 ) { + $inpoint = array_shift( $lines ); + $outpoint = array_shift( $lines ); + $out .= $this->showline( $inpoint, $outpoint, $namespace ); } $out .= '
'; - $nsForm = $this->namespaceForm( $namespace, '', false ); + $nsForm = $this->namespaceForm( $namespace, $from, $to ); # Is there more? - if ( $including ) { + if( $including ) { $out2 = ''; } else { - $morelinks = ''; - if ( $morelinks != '' ) { + if( isset($from) || isset($to) ) { + global $wgUser; $out2 = ''; $out2 .= '
' . $nsForm; - $out2 .= ''; - $out2 .= $morelinks . '
'; + $out2 .= '' . + $wgUser->getSkin()->makeKnownLink( $wgContLang->specialPage( "Allpages" ), wfMsgHtml ( 'allpages' ) ); + $out2 .= "
"; } else { $out2 = $nsForm . '
'; } } - $wgOut->addHtml( $out2 . $out ); } @@ -207,14 +220,14 @@ function showline( $inpoint, $outpoint, $namespace = NS_MAIN ) { $align = $wgContLang->isRtl() ? 'left' : 'right'; $inpointf = htmlspecialchars( str_replace( '_', ' ', $inpoint ) ); $outpointf = htmlspecialchars( str_replace( '_', ' ', $outpoint ) ); - $queryparams = ($namespace ? "namespace=$namespace" : ''); - $special = SpecialPage::getTitleFor( $this->name, $inpoint ); - $link = $special->escapeLocalUrl( $queryparams ); + $queryparams = $namespace ? "namespace=$namespace&" : ''; + $special = SpecialPage::getTitleFor( $this->name ); + $link = $special->escapeLocalUrl( $queryparams . 'from=' . urlencode($inpoint) . '&to=' . urlencode($outpoint) ); $out = wfMsgHtml( 'alphaindexline', - "$inpointf", - "$outpointf" + "$inpointf", + "$outpointf" ); return ''.$out.''; } @@ -223,18 +236,20 @@ function showline( $inpoint, $outpoint, $namespace = NS_MAIN ) { * @param integer $namespace (Default NS_MAIN) * @param string $from list all pages from this name (default FALSE) */ -function showChunk( $namespace = NS_MAIN, $from, $including = false ) { +function showChunk( $namespace = NS_MAIN, $from, $to, $including = false ) { global $wgOut, $wgUser, $wgContLang; $sk = $wgUser->getSkin(); - $fromList = $this->getNamespaceKeyAndText($namespace, $from); + $fromList = $this->getNamespaceKeyAndText( $namespace, $from ); + $toList = $this->getNamespaceKeyAndText( $namespace, $to ); + $namespaces = $wgContLang->getNamespaces(); $align = $wgContLang->isRtl() ? 'left' : 'right'; $n = 0; - if ( !$fromList ) { + if ( !$fromList || !$toList ) { $out = wfMsgWikiHtml( 'allpagesbadtitle' ); } elseif ( !in_array( $namespace, array_keys( $namespaces ) ) ) { // Show errormessage and reset to NS_MAIN @@ -242,17 +257,19 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) { $namespace = NS_MAIN; } else { list( $namespace, $fromKey, $from ) = $fromList; + list( $namespace, $toKey, $to ) = $toList; $dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( 'page', array( 'page_namespace', 'page_title', 'page_is_redirect' ), array( 'page_namespace' => $namespace, - 'page_title >= ' . $dbr->addQuotes( $fromKey ) + 'page_title >= ' . $dbr->addQuotes( $fromKey ), + 'page_title <= ' . $dbr->addQuotes( $toKey ), ), __METHOD__, array( - 'ORDER BY' => 'page_title', + 'ORDER BY' => 'page_title ASC', 'LIMIT' => $this->maxPerPage + 1, 'USE INDEX' => 'name_title', ) @@ -291,87 +308,15 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) { if ( $including ) { $out2 = ''; } else { - if( $from == '' ) { - // First chunk; no previous link. - $prevTitle = null; - } else { - # Get the last title from previous chunk - $dbr = wfGetDB( DB_SLAVE ); - $res_prev = $dbr->select( - 'page', - 'page_title', - array( 'page_namespace' => $namespace, 'page_title < '.$dbr->addQuotes($from) ), - __METHOD__, - array( 'ORDER BY' => 'page_title DESC', 'LIMIT' => $this->maxPerPage, 'OFFSET' => ($this->maxPerPage - 1 ) ) - ); - - # Get first title of previous complete chunk - if( $dbr->numrows( $res_prev ) >= $this->maxPerPage ) { - $pt = $dbr->fetchObject( $res_prev ); - $prevTitle = Title::makeTitle( $namespace, $pt->page_title ); - } else { - # The previous chunk is not complete, need to link to the very first title - # available in the database - $options = array( 'LIMIT' => 1 ); - if ( ! $dbr->implicitOrderby() ) { - $options['ORDER BY'] = 'page_title'; - } - $reallyFirstPage_title = $dbr->selectField( 'page', 'page_title', array( 'page_namespace' => $namespace ), __METHOD__, $options ); - # Show the previous link if it s not the current requested chunk - if( $from != $reallyFirstPage_title ) { - $prevTitle = Title::makeTitle( $namespace, $reallyFirstPage_title ); - } else { - $prevTitle = null; - } - } - } - - $nsForm = $this->namespaceForm( $namespace, $from ); + $nsForm = $this->namespaceForm( $namespace, $from, $to ); $out2 = ''; $out2 .= '
' . $nsForm; $out2 .= '' . - $sk->makeKnownLink( $wgContLang->specialPage( "Allpages" ), - wfMsgHtml ( 'allpages' ) ); - - $self = SpecialPage::getTitleFor( 'Allpages' ); - - # Do we put a previous link ? - if( isset( $prevTitle ) && $pt = $prevTitle->getText() ) { - $q = 'from=' . $prevTitle->getPartialUrl() - . ( $namespace ? '&namespace=' . $namespace : '' ); - $prevLink = $sk->makeKnownLinkObj( $self, - wfMsgHTML( 'prevpage', htmlspecialchars( $pt ) ), $q ); - $out2 .= ' | ' . $prevLink; - } - - if( $n == $this->maxPerPage && $s = $dbr->fetchObject($res) ) { - # $s is the first link of the next chunk - $t = Title::MakeTitle($namespace, $s->page_title); - $q = 'from=' . $t->getPartialUrl() - . ( $namespace ? '&namespace=' . $namespace : '' ); - $nextLink = $sk->makeKnownLinkObj( $self, - wfMsgHtml( 'nextpage', htmlspecialchars( $t->getText() ) ), $q ); - $out2 .= ' | ' . $nextLink; - } + $sk->makeKnownLink( $wgContLang->specialPage( "Allpages" ), wfMsgHtml ( 'allpages' ) ); $out2 .= "
"; } $wgOut->addHtml( $out2 . $out ); - if( isset($prevLink) or isset($nextLink) ) { - $wgOut->addHtml( '

' ); - if( isset( $prevLink ) ) { - $wgOut->addHTML( $prevLink ); - } - if( isset( $prevLink ) && isset( $nextLink ) ) { - $wgOut->addHTML( ' | ' ); - } - if( isset( $nextLink ) ) { - $wgOut->addHTML( $nextLink ); - } - $wgOut->addHTML( '

' ); - - } - } /** @@ -381,7 +326,7 @@ function showChunk( $namespace = NS_MAIN, $from, $including = false ) { * @static (sort of) * @access private */ -function getNamespaceKeyAndText ($ns, $text) { +function getNamespaceKeyAndText( $ns, $text ) { if ( $text == '' ) return array( $ns, '', '' ); # shortcut for common case @@ -401,4 +346,5 @@ function getNamespaceKeyAndText ($ns, $text) { return NULL; } } + } diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index da55356a37..95c415b71f 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -2004,6 +2004,7 @@ You can narrow down the view by selecting a log type, the user name, or the affe 'nextpage' => 'Next page ($1)', 'prevpage' => 'Previous page ($1)', 'allpagesfrom' => 'Display pages starting at:', +'allpagesto' => 'Display pages ending at:', 'allarticles' => 'All pages', 'allinnamespace' => 'All pages ($1 namespace)', 'allnotinnamespace' => 'All pages (not in $1 namespace)', diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 1597e7d14d..3da6225845 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -1285,6 +1285,7 @@ $wgMessageStructure = array( 'nextpage', 'prevpage', 'allpagesfrom', + 'allpagesto', 'allarticles', 'allinnamespace', 'allnotinnamespace',